From aa794a664647ddd00b126e77f4b1bfe78d05d39b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 6 Jul 2004 13:28:42 +0000 Subject: [PATCH] Make sure private->monitor_num is a valid monitor number before using it. 2004-07-06 Matthias Clasen * gtk/gtkmenu.c (gtk_menu_position): Make sure private->monitor_num is a valid monitor number before using it. (#139187, Michael Natterer) 2004-06-25 Matthias Clasen * gtk/gtkfontbutton.c (gtk_font_button_update_font_info): Avoid a crash if the font doesn't exist. (#144967, Yevgen Muntyan) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkmenu.c | 3 +++ 5 files changed, 27 insertions(+) diff --git a/ChangeLog b/ChangeLog index 71369b7681..58443a4dce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-07-06 Matthias Clasen + + * gtk/gtkmenu.c (gtk_menu_position): Make sure + private->monitor_num is a valid monitor number before + using it. (#139187, Michael Natterer) + Tue Jul 6 02:00:28 2004 Matthias Clasen * gtk/gtkfilechooserdefault.c (popup_position_func): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 71369b7681..58443a4dce 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2004-07-06 Matthias Clasen + + * gtk/gtkmenu.c (gtk_menu_position): Make sure + private->monitor_num is a valid monitor number before + using it. (#139187, Michael Natterer) + Tue Jul 6 02:00:28 2004 Matthias Clasen * gtk/gtkfilechooserdefault.c (popup_position_func): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 71369b7681..58443a4dce 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2004-07-06 Matthias Clasen + + * gtk/gtkmenu.c (gtk_menu_position): Make sure + private->monitor_num is a valid monitor number before + using it. (#139187, Michael Natterer) + Tue Jul 6 02:00:28 2004 Matthias Clasen * gtk/gtkfilechooserdefault.c (popup_position_func): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 71369b7681..58443a4dce 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2004-07-06 Matthias Clasen + + * gtk/gtkmenu.c (gtk_menu_position): Make sure + private->monitor_num is a valid monitor number before + using it. (#139187, Michael Natterer) + Tue Jul 6 02:00:28 2004 Matthias Clasen * gtk/gtkfilechooserdefault.c (popup_position_func): diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 0e388120cf..a38adbc974 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -3311,6 +3311,9 @@ gtk_menu_position (GtkMenu *menu) if (menu->position_func) { (* menu->position_func) (menu, &x, &y, &push_in, menu->position_func_data); + if (private->monitor_num < 0) + private->monitor_num = gdk_screen_get_monitor_at_point (screen, x, y); + gdk_screen_get_monitor_geometry (screen, private->monitor_num, &monitor); } else -- 2.30.2